From FIXME: local path for ADD
Merge pull request #1793 from reds/master

From FIXME: local path for ADD