Also some updates to compile with latest changes to core py.
Attach a file by drag & drop or click to upload
