master-bc-1971

https://issues.liferay.com/browse/LIFERAYQA-9873
https://issues.liferay.com/browse/LIFERAYQA-9875
https://issues.liferay.com/browse/LIFERAYQA-9426
https://issues.liferay.com/browse/LIFERAYQA-9823
https://issues.liferay.com/browse/LIFERAYQA-9889