LP#1908722: stamp schema update