Merge "Do not immediately perform traversals when executing transition" into pi-dev