Merge branch 'jlouis/fix-fpmap-construction' into next