Updates and plans before f38 branching