Merge mc -> pine