Create a const iterator explicitly.
Merge topic 'tll-includes-defines' into next

71c6121 Create a const iterator explicitly.