master-bc-2365

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