master-qa-10311

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