Merging in changes for actual headless branch detection