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