Bump up maxVersion to 21.0