master-bc-1443

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