counterplan template improved
sync with k2 2.6.7