remove SHARED
Rebase from 'upstream'
remove SHARED