Merge pull request #2624 from wpaulino/2609-follow-up