* Merge master-next changes in master (include vdi development in master branch) [ROCm/hip-tests commit: e46a4e3e48]
e46a4e3e48