master-qa-12235

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