#19747 Resolve further issues