XD-2146 Upgrade to 1.1.7.BUILD-SNAPSHOT