dev-amec-1958 polishing schema update