Merge branch 'less-critical' into run