Merge branch 'misc_2021.1.0' into 'master'

Miscellaneous fixes/improvements

Closes #245, #138, #231, #191, and #202

See merge request !134
3 jobs for master in 9 minutes and 44 seconds (queued for 28 seconds)