Merge branch 'move-backend-images' into 'develop'