Carbon 1.7 FINAL COMMIT