master-bc-2042

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