Merge "SF: Rename postComposition and related for clarity" into main