master-bc-1057

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