Merge branch 'newfail' into approv