Merge pull request #2602 from castillofrancodamian/base