Gerneralize Reuse
Merge branch 'master' into reuse

Merge master in reuse