LP#1917826: stamp schema update