Merge "Update 30 snapshot of non-updatable part" into rvc-dev