Fully merged comments and history with star-of-refactored