master-bc-2412

https://issues.liferay.com/browse/LIFERAYQA-10731
https://issues.liferay.com/browse/LIFERAYQA-11037
https://issues.liferay.com/browse/LIFERAYQA-11004
https://issues.liferay.com/browse/LIFERAYQA-11063
https://issues.liferay.com/browse/LIFERAYQA-11054