Squash merge of initial-import branch