Apply Patch 10217 from https://blacklight.codeplex.com/SourceControl/list/patches
and also implement it in WPF and the Example Apps