New pr 2376

fixes #5113 
fixes #7431