Added feature TC-796