LP#1817645: stamp schema update