master-mh-1222

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