master-qa-9020

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