PAHMA-677: Merge into master

Merge branch PAHMA-877 into master