master-bc-2052

https://issues.liferay.com/browse/LIFERAYQA-10072
https://issues.liferay.com/browse/LIFERAYQA-10053
https://issues.liferay.com/browse/LIFERAYQA-10100