Merging cfa/municipal changes with com/municipal changes

Hope doing this right! :-)