Merge "Allow Windows platform also add idler with return" into devel/master