Merge remote-tracking branch 'psa/pr/45' into feature-psa