Merge branch 'proxy_https' into 'dev'

Adding support for a prototype parameter in interactive tools.

See merge request !65