fix test bug-001.
fix test bug-002.
feature C 001.
feature C 002.
Merge branch 'release-1.0.1a' into dev
Merge branch 'feature-C' into dev