This fixes issue #832. Generated code changes in next commit.
Attach a file by drag & drop or click to upload
