updates for bug 823097
work on bug 823097