Conflict 1.2 common helper
Merge remote-tracking branch 'origin/UAT' into 110.1-sales-Sponsoring-backend-coding