Change template state condition
Merge remote-tracking branch 'origin/vispractice' into vispractice