NickAkhmetov/Unified Views Fixes (CAT-847, CAT-849, CAT-853, CAT-850, CAT-857, CAT-855, CAT-848, CAT-851)

NickAkhmetov/Unified Views Fixes (CAT-847, CAT-849, CAT-853, CAT-850, CAT-857, CAT-855, CAT-848, CAT-851) #2814