Rebase from 'indigo'