Merge pull request #1121 in master
onBoostrap => onDispatch
Merge branch 'master' into develop