Source merges with experimental branch