[899753] Part 1: Fixed refactoring columns