Extern repo update/maintenance

mostly related to MTM fixes