master-bc-1677

https://issues.liferay.com/browse/LIFERAYQA-8979
https://issues.liferay.com/browse/LIFERAYQA-8705