Merge remote-tracking branch 'origin/dev' into fix/doctor-custom-providers-rebased