Merge pull request #3154 from castillofrancodamian/base