master-bc-933

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