Merge branch 'improve/instance-gen' into 'develop'