[golang/f19] (26 commits) ...Merge branch 'f20' into f19