Merge remote-tracking branch 'B70-ZK-2057' of github.com/danchen0720