Enhancing support for override fields
Version bump to 2.0.22
Regenerate gemspec for version 2.0.22