reverted patch and just changed poll timeout
merged with remote