Merge pull request #2570 from castillofrancodamian/minidla