Merge "Update documentation according API review"