Merge "Fixes bug 938953 parsing of image id"