Fix variable name causing a NameError.
Merge next-stable.
Add code_file example tool from Bjoern.