merge master and resolve conflicts

2 jobs for !73 with shared_partition_azure_fix in 56 minutes and 52 seconds (queued for 1 second)
latest merge request