FI bug fixes
Merge branch 'ui-dev' of https://github.com/rahuupad/UnifiedStack into ui-dev