master-bc-1666

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