Updated according to comments from upstream integration