Merge Chain-engineering back in