master-bc-2405

https://issues.liferay.com/browse/LIFERAYQA-11010
https://issues.liferay.com/browse/LIFERAYQA-11023
https://issues.liferay.com/browse/LIFERAYQA-11029
https://issues.liferay.com/browse/LIFERAYQA-11031