[bugfix] resolution for extend
[bugfix] resolution for extend
Merge branch 'dev' into dev-refactor