master-bc-2364

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