merge rev 17315