Simplify callback.
Merge branch 'master' into source-script-detection