Sync with Origami 1.2