master-bc-1643

https://issues.liferay.com/browse/LIFERAYQA-8787
https://issues.liferay.com/browse/LIFERAYQA-8800