initially add code for MasterInherit
Merge branch 'develop'