3.1 update to PSC template #3172

The template and the snapshot