master-bc-1458

https://issues.liferay.com/browse/LIFERAYQA-8371