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