master-bc-1954

https://issues.liferay.com/browse/LIFERAYQA-9478
https://issues.liferay.com/browse/LIFERAYQA-9842
https://issues.liferay.com/browse/LIFERAYQA-9843
https://issues.liferay.com/browse/LIFERAYQA-9815
https://issues.liferay.com/browse/LIFERAYQA-9814
https://issues.liferay.com/browse/LIFERAYQA-9835