Merge branch 'parse-into-fusion-map' into develop