Merge with upstream - Add version 0.9.37.1