master-bc-2533

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