Pull mca-cleanup into release branch