use get incase id not in opts
Merge remote-tracking branch 'upstream/develop' into sam_raet_49
Merge pull request #13947 from SmithSamuelM/sam_raet_49

Used get. for some reason opts['id'] not always available