Fix a missing return statement (TUI-64)
Merge branch 'tui-64' into oms-97