master-bc-2232

https://issues.liferay.com/browse/LIFERAYQA-10499
https://issues.liferay.com/browse/LIFERAYQA-10478
https://issues.liferay.com/browse/LIFERAYQA-10541
https://issues.liferay.com/browse/LIFERAYQA-10554