Merge branch 'jc/maint-undefined-i18n-observation-test'