finally working with external switch
Merge branch 'master' into id_reset
external switch: working version