merge HoNVC for pull to get connors work
committing for merge off HoNVC