master-bc-942

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