master-bc-2333

https://issues.liferay.com/browse/LIFERAYQA-10729
https://issues.liferay.com/browse/LIFERAYQA-10601
https://issues.liferay.com/browse/LIFERAYQA-10665