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