Commons 5.0.x

Yo.

You should merge this in, and then do future Modeling Commons work (including my suggested code improvements) on this 5.0.x branch.  See your original pull request for an explanation.