updated: upstream is now at 19.22