Fix for OPENAM-5925, review FR-689
Backported fix for OPENAM-3245 to 11.0.x
Fix for OPENAM-3245, IM review with PM.
Fix for AME-202 - review: CR-802