Intial Patch for HIVE-4331