Without this you can't create a scratch delta from GI. While here, switch the deprecated allow-none annotations to nullable.
Dan Nicholson