Merge "Fix image properties parsing"