Now we assume private_encoding as the default.
Merge branch 'output_magic' into develop