Resolves CROSSDATA-202 & CROSSDATA-203