Merge branch 'feat/instance-gen-improvements' into 'develop'