Merge "Fix transparent region tests" into tm-dev