Merge pull request #5299 from cherusker/cherusker-2017-08-01-next-generic-inst-id