dev-chris merge