Merge fix for Patch Tracker #3173059