Merge with upstream version 3.1.15