new commits from roidy to 'default' template