Fixed #251: The id is no more set if this one equals "null".
Merge remote-tracking branch 'origin/r/3.1.x' into r/3.1.x