Image + es cluster key fix, built from develop branch.