Commit
#7141 , #7173, #7235