master-bc-784

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