6c372f61f1
Fix duplicate years due to type mismatch Original-merge: 6fba30a0a9c464eb13017f49d12e9a4e23fe3e43 Merged-by: thornbill <thornbill@users.noreply.github.com> Backported-by: thornbill <thornbill@users.noreply.github.com>