Backport/bugfix 2p analytic derivatives

Merged Timo Koch requested to merge backport/bugfix-2p-analytic-derivatives into releases/3.1

Merge request reports