Squash merge of initial-commit branch