master-bc-2091

https://issues.liferay.com/browse/LIFERAYQA-10110
https://issues.liferay.com/browse/LIFERAYQA-10138
https://issues.liferay.com/browse/LIFERAYQA-10176