quick hack for instance param. tbd.
Merge branch 'master' into develop