Remove deviation from upstream
Merge branch 'master' into atf