Manual merge of KIF 2.0 core into our test controller for Xocde5