Merge "Sort list of flags, change comment about REVIEW_REQUIRED" into tm-dev