Merge remote branch 'origin/bug330776-framework-hooks' into bug333474-DS-remove-startup-order