97054 davrich\kevinw : Merge to test - OpSuite Bug 20433: WPF Item Data Management - Update Bug