Missing fixes for the revision 5301.