Updated latest changes from cmv