TS-1827

TS-1827 minor improvement of combo_handler plugin
[https://issues.apache.org/jira/browse/TS-1827]