On the 'pristines-on-demand-on-mwf' branch: Sync with trunk@1905479, resolving conflicts in depth_tests.py and patch_tests.py.