Closes xapi-project/sm#1