Merge pull request #1 from 30x/rj_XAPID-999

[XAPID-999] fix duplicate config in response, added configuration to …