Merge "Fix the parsing of images without hashtree descriptor"