Putting Issue #10 on hold while waiting for comment