Merge branch 'noslicemgr' into nocomponent