Modifed Timeout on idx feed to 4 seconds
Merge remote-tracking branch 'origin/master'