am e6798a83: Merge "Refactor quick entrypoints"

* commit 'e6798a8340fa4a02bf7719f8c45b04635ff4e9dd':
  Refactor quick entrypoints