master-bc-2074

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