master-bc-2459

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