[#69093684] title fixes
[#69093684] small bug fix
Merge branch 'pairings-fixes' into develop