[KFSQA-1099] Partial changes. No clean run yet. Committing to work on another branch.