master-bc-2252

https://issues.liferay.com/browse/LIFERAYQA-10579
https://issues.liferay.com/browse/LIFERAYQA-10555
https://issues.liferay.com/browse/LIFERAYQA-10591
https://issues.liferay.com/browse/LIFERAYQA-10626