master-bc-3066

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