I believe all the critiques are now addressed. I am rerunning the tests on Mac and Linux, and if all goes well with squash-merge this topic branch to master.

So if there are any last issues, please let me know.

thanks, r