Cover current API by swagger documentation
Resolve merge conflicts