satya-BugFixes

occupation code, UAT bugs 3299, 3219, 3220, 3461, 3303, 3217, 3218, 3419