Merge branch 'hotfix/surface-load'
set callback before start load
Merge branch 'hotfix/strict-load-callback' into develop