merge related changes from VOV-2727