Merge branch 'master' into script-fsm