[NT]API keys  & show quota improvements.
Merge remote-tracking branch 'origin/master'