Include both session years when scoping.
Merge branch 'master' into prod