Merge "Add logs for 4x4 to 4x5 missing row bug" into main