first check in by branch-0.20-r911707