[For discussion purposes] XD-2198-2199

For discussion with @dturanski