Merge pull request #2423 from wpaulino/2403-fixups