[PULL 00/39] Migration 20231024 patches