Merge branch '2021-08-02-numeric-input-cleanups'