Update API Console branch
Resolve merge conflict