Merge "Refactor quick entrypoints"