Merge "Change bypassRoleQualification persistence logic" into tm-dev