Merged experimental branch