master-bc-943

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