LP#1831803: stamp schema update