Image fix
Merge branch 'remotedb' into hosted