Merge "Fix issue #5214105 and work on issue #5109947."