master-bc-2536

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