bug 10
merge