Merge pull request #2568 from castillofrancodamian/dynapoint