bugfix
Merge branch 'hotfix/applyChanges-undefined'