[boshiamy] Remove unused function
[boshiamy] Add logic to handle fallback matching
Merge branch 'boshiamy_im' into develop