Repackaged to include fix for TIMOB-14806.