Merge image tools with 1.5.5.1