Adding support for xctool
Merge commit 'bf4f910c9ec5cefdf58c63c6cf00ceb32dacbd71' into develop