adding configurable resolve/match table name #25
Merge branch 'release/1.3.14' into develop