Merge "Merge "Fixed bug in handling of OTHER as terminal" into oc-mr1-dev am: e95197a664 am: 35d91afa74"