Poor commit style: this commit includes many changes over a long time (Jan-Feb 2022)
