master-bc-1936

https://issues.liferay.com/browse/LIFERAYQA-9341
https://issues.liferay.com/browse/LIFERAYQA-9771
https://issues.liferay.com/browse/LIFERAYQA-9749
https://issues.liferay.com/browse/LIFERAYQA-9791
https://issues.liferay.com/browse/LIFERAYQA-9805

This combines:
https://github.com/brianchandotcom/liferay-portal/pull/19426
https://github.com/brianchandotcom/liferay-portal/pull/19423