master-bc-1037

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