Applied upstream sxiv changes.