Merge branch 'vlan/python-fixes'