First commit, v9.4 plus extras