Merge branch 'main' into handle_rank3_fields

Using strategy 'ours' to ignore changes coming from main (which are from
#633) because they are already
incorporated into this branch.

Author: billsacks