master-bc-1627

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