Somewhat controlled overflow behavior in variable id counter.
Merge branch 'dev' into 1.6