changes from shelluser
gemerged