[MR] {other} some changes