master-bc-922

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