Merge with tag public-0.6 (tools/generateds)