master-bc-1594

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