Checking for image versions and some cleanup.
Merge branch 'test' into dev