master-bc-1068

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