KNL-1123 Pull into out build (needed for reset-pass)