Merge pull request #2780 from wpaulino/2691-follow-ups