added override info
Merge branch 'release/1.0.10'