added uid to filter:header.build
Merge remote-tracking branch 'origin/master' into 0.5.1