setconsumer conversion, copy fix from -stable
setconsumer conversion, copy fix from -stable

ssinger/skytools-cvs,mpihlak/skytools-dev,ssinger/skytools-cvs,mpihlak/skytools-dev,ssinger/skytools-cvs,mpihlak/skytools-dev