Merge "Fix bug in Killswitch implementation" into main