Issues #7524 #7525