Updates for v14, prelim work for v15