Fix instance_path
Merge branch 'bugfix_instance_path' into devel