release1-fixes