master-bc-2352

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