LILY-498: Fix case pk sometimes being null
LILY-498: Fix case pk sometimes being null
Merge branch 'feature/LILY-498-fix-case-pk-sometimes-being-null' into develop