Merge branch 'jk/remove-remote-helpers-in-python'