Merge "CPS-475 - Fix SQ codesmells introduced as aprt of CPS-887"