Merge branch 'cmpxchg_user_key' into features