[591303] Part 1 fixed commit message