Manual merge to allow build

Application was not compiling before.