Feedback changes from Pull Request 2620