master-bc-2066

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