Merge "Temporary NPE mitigation." into tm-dev