Merge "Reciprocate MATCH_CLONE_PROFILE usages to MATCH_CLONE_PROFILE_LONG" into main