Merge updates from master branch into dev-test-hardcoded_paths

in 13 minutes and 42 seconds, using 0 compute credits, and was queued for 3 seconds