Oh wow, nice! I didn’t expect that merging those changes would be doable without many many headaches.
I just realized that the 3.3 upgrade docs are missing an important step to reindex the DB after the upgrade.
It’s documented here for 3.1: Upgrading and Updating Foreman
I’ll make sure to fix the docs, and you please run the reindex (otherwise you might get DB corruption at some point).