Merge pull request #2081 from atsign-foundation/gkc-at-lookup-back-to-3-6-0