AUI-1003

https://issues.liferay.com/browse/AUI-1003