fix for removal of bf: prefix on bf:data attributes; adapted test case accordingly.
Merge remote-tracking branch 'upstream/development' into development