AUI-1518

Ticket: [AUI-1518](https://issues.liferay.com/browse/AUI-1518)