merge from electricity_power_fixes/2/doorcontroller - this is merge hell, Flavien to reapply some changes post merge