master-bc-1042

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