Minor merges before final bug fixing.