Merge "Implement code sinking."