master-qa-8723

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