Fixed #13711, #13528 -- Fixed problems in autogeneration and autotruncat...

...ion.
I am not in favour of adding that.
I'll wait and see what @timgraham has to say.