Resolve the cherry-pick conflict from development branch