Typo in variable name
Merge remote-tracking branch 'origin/development' into development
Changelog update