modify rules into model sharing
Merge branch 'master' into dev/master