Merge branch 'SSP-1668-attrib-canonicalization' into ssp-master