master-bc-2048

https://issues.liferay.com/browse/LIFERAYQA-10067
https://issues.liferay.com/browse/LIFERAYQA-10044
https://issues.liferay.com/browse/LIFERAYQA-10046