reintegrate source code 0.8.0.6 v3