Merge "Some changes for md-vv extracted from 4.6" into release-4-5-patches