master-bc-1994

https://issues.liferay.com/browse/LIFERAYQA-9644
https://issues.liferay.com/browse/LIFERAYQA-9897
https://issues.liferay.com/browse/LIFERAYQA-9869
https://issues.liferay.com/browse/LIFERAYQA-9900
https://issues.liferay.com/browse/LIFERAYQA-9909