f2e1118d7a
* Merge master-next changes in master (include vdi development in master branch)
* Merge master-next changes in master (include vdi development in master branch)