master-bc-1562

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