7.x uofm changes