Merge pull request #1530 from anilgooru/dev-branch

Added support for Assignment goals.
reindex set to 98
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: