Rebase from 'upstream' @ version '1.5.31'