Merged last LOCM3 master