Closes #59 (closed) and closes #74 (closed).
Turbo
To be tested with: LHCb!3806 (merged), Moore!1812 (merged) and Analysis!914 (merged)