[master] Tuesday's "friday refactorization"