Merge branch 'feature/1710-consolidate-instance-info' into 'develop'