0001-Backport-trunk-code-till-2018-03-05.patch
