master-bc-941

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