This is the continuation of !517 (closed) on the main remote, so it can be accessible by @ryan.pavlik and myself.