merged rev. 75641,75859 (bugfixes: incorrect setting of current state at start(), continued processing after deferring)