# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Merge done to enable documentation be be fixed, because of removal of
alias directive and addition of related algorithms directive.

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Re #18366

Re #18366

Re #18366

Re #18366

Re #18275

Refs #9059

Just checking that it's not empty can mean that filling it is in
progress, so we need to enter the critical block if that's the case.
This shouldn't have much (any?) performance implication as size(),
like empty(), takes constant time.

Should stop GetDetOffsetsMultiPeaks performance test from failing
sporadically.

Need for this highlighted by performance test failure (GetDetOffsetsMultiPeaksTestPerformance).