[PATCH 1/3] Move custom storage setup into its own thread.