* commit 'b3bd029b5ab2df8c86ab903bc597f858298be157': Add differentiating transitions for returning/reentering.