LP#1806709: stamp schema update