master-bc-823

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