HIVE-4216.2.patch