master-bc-2394

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