master-bc-935

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