Resolves issue CROSSDATA-187