Back ported the terminal filter code.
Merge remote-tracking branch 'origin/1.1.4' into development