Merge branch 'hotfix/v1.19.1'
Fix SPOR not assigning and add e2e test for this scenario
Merge branch 'hotfix/v1.19.2' into develop