Move image server to non versioned filename
Merge branch 'release/1.3.1'

* release/1.3.1:
  Move image server to non versioned filename