#1283 update year choices
Merge branch 'sno_branch_updates' into bixly-testing