Upgrade to HDIV 2.17