fixin elastic and model
uprev
Merge branch 'release/1.0.2'