Merge branch '517-refine-the-definition-of-the-apikey-s-hook-and-prov…

Merge branch '517-refine-the-definition-of-the-apikey-s-hook-and-prov… #383