Merge "Fix issue #6268190"