LP#1970946: stamp schema update