Changed year types
Deleted imputed nationality and other fixes
Merge remote-tracking branch 'origin/develop' into develop