Resolves CROSSDATA-183 & CROSSDATA-190