Merged DamsFunction updates. DHH-113