Merge branch '2384_rebind_fx_keys'