master-bc-934

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