Merge master to feature branch 14-precision-and-robustness-of-likelihood-scans

Merging changes that happened on master while 14-... was in development as combined features are urgently needed