Update various files; ready to merge to upstream