residual new fire merge (DO NOT MERGE)

after the last pr i found that there are residual differences after a merge with pele master, not sure whether these are redundant or not