Merge remote-tracking branch 'emmapeel/doc/14589-additional-software' into doc/14589-additional-software