LP#1915219: stamp schema update