Manual merge from api branch