merge master into dev-test_vis_metadata and resolve conflicts

4 jobs for dev-test_vis_metadata
in 16 minutes and 29 seconds, using 0 compute credits, and was queued for 3 seconds