11/26 pre-Vincent branch merge