master-bc-2056

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