Merge remote-tracking branch 'upstream/master' into robustness_improvements
Further robustness improvements
Merge branch 'robustness_improvements'