Merge "Assert the non-presence of stamp" into rvc-dev