IDM changes
Merge remote-tracking branch 'upstream2/master'