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