Merge pull request #2235 from ten24/feature-taxintegration-ds

Feature taxintegration ds
Merge pull request #2236 from ten24/feature-taxintegration-ds

Feature taxintegration ds
Added integration setting for server location