Use identifiers of Instance
Merge branch 'master' into history