Experiment with comment templates
Merge branch 'auth_extend' into realtimeify