Unlock in ftu 2 1 bug 1088157

PR for purposes of examining Gaia-Try results when rebased. The commit was already merged to v2.1