pr-21

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