master-bc-2244

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