#19747 Resolve issues