Fixes for XAUTH-113
* Fixes XAUTH-111
* Fixes XAUTH-112
* Fixes XAUTH-113
* Fixes XAUTH-114
* Fixes XAUTH-115
* Fixes XAUTH-116
* Fixes XAUTH-117
* Fixes XAUTH-120
* Fixes XAUTH-123