Merged branches/tiran-zpt-pydefer r29702:30399 into trunk (including manual merge because I renamed the original branch)