#codereview ori.cohen, ben.marsh, michael.trepka, mark.satterthwaite, dmitry.rekman [CL 2495503 by James Golding in Main branch]