master-bc-2099

https://issues.liferay.com/browse/LIFERAYQA-10151
https://issues.liferay.com/browse/LIFERAYQA-10159
https://issues.liferay.com/browse/LIFERAYQA-10186
https://issues.liferay.com/browse/LIFERAYQA-10196