Change-Id: I06d198bbb4a499e153b290b73a92afed3553b252
* Merge master-next changes in master (include vdi development in master branch)