Release v2.2.1 - fix deprecation warnings from templates