This commit is not atomic at all and contains various changes.
Expecially to the org config.
Quite a few changes. Didn't commit in a while.