master-bc-1572

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