PBC fix bundle #2039

Job	Run time
macos-latest: clang++ Release Threads	9m 22s
macos-latest: clang++ Release OneTBB	1m 2s
macos-latest: clang++ Release PaRSEC	1m 50s
ubuntu-20.04: /usr/bin/g++-9 Release Threads	36m 24s
ubuntu-20.04: /usr/bin/g++-9 Release OneTBB	56s
ubuntu-20.04: /usr/bin/g++-9 Release PaRSEC	58s
macos-latest: clang++ Debug Threads	18m 13s
macos-latest: clang++ Debug OneTBB	1m 29s
macos-latest: clang++ Debug PaRSEC	1m 23s
ubuntu-20.04: /usr/bin/g++-9 Debug Threads	48m 9s
ubuntu-20.04: /usr/bin/g++-9 Debug OneTBB	1m 45s
ubuntu-20.04: /usr/bin/g++-9 Debug PaRSEC	1m 48s
	2h 3m 19s

Provide feedback