Merge branch 'master' into null_safety