Pending commit from Alicante, added output parameter.