#660 - Updated directive to use data promise correctly.
Merge remote-tracking branch 'origin/t660' into t660