master-bc-1671

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