merge from git/mathias/revisions
fixed deletion of CreateOneTrait