Fixup local_dev (should be rebased before merge)