sync with private git ver.0.6.14