Merge pull request #2127 from atsign-foundation/gkc-strengthen-from-challenge