Merge "Initial support for RFC2385"