Fixes in DiscoverVC
Merge branch 'feature/user-ui-flow' into ParseBranch
Merge branch 'ParseBranch' into feature/user-ui-flow