Latest changes committed before pc cleanup