AUI-1768

This is an update for [AUI-1768](https://issues.liferay.com/browse/AUI-1768).<br><br>