started work for bug 917227