Merge branch 'on_load-fix' into develop