master-sc-107

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