Merge pull request #1147 from anilgooru/dev-branch

Changes to place token and changed url for lps.
Fixed ui issue in search for FF
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: