Merging latest M9 stuff