Merge of vhudpi_mod