Null-merged 3.2 section order preservation fix when using `__setitem__` (issue
#16820)