Adapting the Modeling Commons functionality to '5.1'
Merge branch 'topic'