master-bc-2039

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