master-bc-931

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