LP#1786534: stamp schema update