latest from upstream Jordan