"handling the unit navigation"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #1933 from suryanarayanakb/dev-branch

Handling the unit navigation