Merge branch 'exp_api_change'