master-bc-1820

https://issues.liferay.com/browse/LIFERAYQA-9409
https://issues.liferay.com/browse/LIFERAYQA-8738
https://issues.liferay.com/browse/LIFERAYQA-9436
https://issues.liferay.com/browse/LIFERAYQA-9448
https://issues.liferay.com/browse/LIFERAYQA-9399