master-bc-824

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