AUI-989

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