Synchronize geom with the master branch (mostly std:: addition)