Fix _immered_cell
and adapt for PartialCellBottom
#3682
+103
−36
Merged