AUI-905 1.5.x Backport