Add support for proxyfication of linked scripts
Merge branch 'development'