22k now in dev mode
(cherry picked from commit 6427ac58134555da4bcee24290f4e391ebcfebbd)