Merge "maintenance: Fix test due to db version change." into rvc-dev