Merge "Avoid duplicate unfreezeProcess" into tm-dev