master-qa-11500

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