Make ID0 work more proper part one
Merge remote-tracking branch 'origin/master'