[960987] Part 1+2: Updated commit msg