Tailorize patch library

Issue US336