sync with vrtadmin master