master-bc-2456

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