Merged work: Attrib Shape qL SOP (updates)