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