mater-bc-1635

https://issues.liferay.com/browse/LIFERAYQA-8730
https://issues.liferay.com/browse/LIFERAYQA-8756