Merge "Fix UiBlcoker regression" into tm-dev