Merge "Reorder members of the class to keep flags at the top." into tm-qpr-dev