Small change in options following Rec!2741 (merged) LHCb!3427 (merged) Moore!1642 (merged) LHCb!3366 (closed)