Merge "reset col position to 1 on row PAC" into lmp-mr1-dev