Upgrade repo and sync config

See commits one by one :)