SENTRY-392: HIVE-7730.002.patch