master-bc-783

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