master-bc-2045

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