Merge all Jan 3.10 hotfixes into SCHOLAR-3.x