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