[i828a] restore zero margins in ColorMap to restore matching of idealized and pixelized maps (#828) () Merging branch 'i828a' into 'main'. See merge request !2116