Message 209031 - Python tracker

The new patch includes changes suggested by Antoine. (This patch should be applied after patch from issue #20373.)