MAM-202 fixed.
Merge remote-tracking branch 'origin/rc4' into rc4