master-qa-12617

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