Merge "Technical debt - Fix PCE sonar issues" into stable/aluminium