master-bc-790

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