master-bc-782

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