Resolves CROSSDATA-309