master-qa-6213

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