removed color attribute from image question block
merge with master