master-bc-2074

https://issues.liferay.com/browse/LIFERAYQA-10126
https://issues.liferay.com/browse/LIFERAYQA-10097
https://issues.liferay.com/browse/LIFERAYQA-10031
https://issues.liferay.com/browse/LIFERAYQA-10140
https://issues.liferay.com/browse/LIFERAYQA-9974sa