Fix bug caused by System.Threading.Tasks v4.7.1
          #892
        
          
                  
     Merged
                
                
              System.Threading.Tasks v4.7.1
          #892