Release v1.6.1 - fix deprecation warnings from templates