Merge "Fixed bug in handling of OTHER as terminal" into oc-mr1-dev