master-bc-2071

https://issues.liferay.com/browse/LIFERAYQA-10065
https://issues.liferay.com/browse/LIFERAYQA-10099
https://issues.liferay.com/browse/LIFERAYQA-10107
https://issues.liferay.com/browse/LIFERAYQA-10111
https://issues.liferay.com/browse/LIFERAYQA-10117