master-sc-122

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