Merge branch 'main' into file-caching

094c697157fdf143b7fd0039952a87006041896e

Tucker McKnight <tmcknight@instructure.com> | Sun Mar 22 2026

Merge branch 'main' into file-caching