Fixed modification log issue
Merge branch '2.0'