Wait for dataset data to load, to fill the values of vm imaging. FIFO-450
Merge branch 'test' into dev
Same for version.
Merge branch 'test' into dev
dist