master-bc-1045

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