Merge Stas's patch #3.