master-bc-2845

https://issues.liferay.com/browse/LIFERAYQA-11789
https://issues.liferay.com/browse/LIFERAYQA-11726
https://issues.liferay.com/browse/LIFERAYQA-11778
https://issues.liferay.com/browse/LIFERAYQA-11727