Merge LogicThird with Master