JIN-14
Added windows image.
Merge branch 'test' into dev