merge w master #1470

Job	Run time
macos-latest: clang++ Release Threads	2m 30s
macos-latest: clang++ Release OneTBB	4m 18s
macos-latest: clang++ Release PaRSEC	3m 13s
ubuntu-20.04: /usr/bin/g++-9 Release Threads	1m 0s
ubuntu-20.04: /usr/bin/g++-9 Release OneTBB	1m 52s
ubuntu-20.04: /usr/bin/g++-9 Release PaRSEC	2m 48s
macos-latest: clang++ Debug Threads	2m 38s
macos-latest: clang++ Debug OneTBB	5m 40s
macos-latest: clang++ Debug PaRSEC	3m 28s
ubuntu-20.04: /usr/bin/g++-9 Debug Threads	1m 8s
ubuntu-20.04: /usr/bin/g++-9 Debug OneTBB	1m 50s
ubuntu-20.04: /usr/bin/g++-9 Debug PaRSEC	2m 50s
	33m 15s

Provide feedback