Merge branch 'reosablo.suggestion-for-CanonicalizedMap-spec'