master-bc-2297

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