Commit from Lion XI, mid-Q1