Merge "Fixed NPE in IPVcListener"