LP#1838995: stamp schema update