master-bc-1533

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