Rebase from 'upstream' @ version '1.1.3'