Merge "Update Promise documentation"