preliminary changes in support of v48