Merge "Add support for Canvas flags on save."