master-bc-2114

https://issues.liferay.com/browse/LIFERAYQA-10000
https://issues.liferay.com/browse/LIFERAYQA-10183
https://issues.liferay.com/browse/LIFERAYQA-10189