Merge pull request #1314 from aparcar/acld