Sync the changes from master / vha branches into the cimi branch, just
to catch it up.