LP#1689608: stamp schema update