Fixed bug when Close button did not work in correction mode incorrectly entered data.
Merge branch 'origin/os-tdd'