ScriptHandlers updated
Merge branch 'scripts'