Using this source as a base to bring us up to mainline for correct patches and merges