Merge main_apfork into main

@alexprescott_email.arizona.edu Bit confused as I thought this was the merge I just made from your request. But it looks like it was the opposite - merged main into main_apfork. So creating new request to get it into main.