rebased #7277

#7277