master-bc-2305

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