Changes from dev-candy