fix for errorcodes not reading languagefiles on confirm
Merge remote-tracking branch 'origin/develop' into develop