Next bunch of fixes for upcoming maintenance release