Merge pull request #2716 from castillofrancodamian/base