master-bc-2138

https://issues.liferay.com/browse/LIFERAYQA-10276
https://issues.liferay.com/browse/LIFERAYQA-10308
https://issues.liferay.com/browse/LIFERAYQA-10320