Merge fix for Patch Tracker #3165001