master-bc-2815

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