Merge PAHMA-1063 fix