Merge pull request #1692 from kodustech/fix/kody-rules-onboarding-backfill