LP#1851413: stamp schema update