merged master with knox