Merge branch 'release/1.1'
Fixes missing updateLeafs call.
Merge branch 'hotfix/missingUpdateLeafs' into develop