AUI-1004 Cherry picked from the fix in 2.0.x. Please backport it to 1.5....

Hi Nate,

It seems to me that you are the right person to do the pull for this fix. This is AUI-1004 for 1.5.x, cherry picked from the commit into 2.0.x. Please backport it to 1.5.x. to fix LPS-42163.

Thanks,
Tobias