Went overboard with the False -> None, retract a bit
Merge local changes into develop