Merge branch 'master' into maddft_newexchange #1866

Job	Run time
macos-latest: clang++ Release Threads	10m 22s
macos-latest: clang++ Release OneTBB	1m 42s
macos-latest: clang++ Release PaRSEC	1m 46s
ubuntu-20.04: /usr/bin/g++-9 Release Threads	23m 13s
ubuntu-20.04: /usr/bin/g++-9 Release OneTBB	1m 50s
ubuntu-20.04: /usr/bin/g++-9 Release PaRSEC	1m 40s
macos-latest: clang++ Debug Threads	4m 50s
macos-latest: clang++ Debug OneTBB	1m 45s
macos-latest: clang++ Debug PaRSEC	2m 27s
ubuntu-20.04: /usr/bin/g++-9 Debug Threads	14m 39s
ubuntu-20.04: /usr/bin/g++-9 Debug OneTBB	1m 41s
ubuntu-20.04: /usr/bin/g++-9 Debug PaRSEC	1m 41s
	1h 7m 36s

Provide feedback