[golang/f19: 4/4] Merge branch 'f20' into f19