adding merges from brux6