Updated Brand and Viktor for latest Common lib changes.