Work on ASF: t+
Work on ASF: no test
Work on ASF: t+
Merge branch 'master' into asf