AUI-998

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