Prepare for after 0.4 experimental
Switch back to experimental branch
Add keys for e-chb