master-bc-1437

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