bc7438 Merge remote-tracking branch 'origin/users/gsu/SLE15-SP6/for-next' into SLE15-SP6

Merged and Committed by Tony Jones a month ago
    Merge remote-tracking branch 'origin/users/gsu/SLE15-SP6/for-next' into SLE15-SP6