Upgrade to HAL 2.1.1.Final