LP#1786100: stamp schema update