bring in MW changes from master