Merge branch 'vici-python'