[46348/46546] System changes