master-bc-1148

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