master-bc-1573

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