Sync with new Rascal stable