Moved around_transition out of protected block
Merge remote-tracking branch 'p1/master'