master-bc-2312

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