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