Merge "Refactor persister: require only capabilities referenced by the xml snapshot...