"That would be great for all of us if and when that happens."<br/><br/>Does there need to be a comma before "if," or is it optional, depending on whether the writer wants a pause there?<br/><br/>Thanks.