master-bc-1064

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