Rebuild of binaries, config sample that works
Some style corrections
another merge from mainline into feature branch