Fix System import tests [story:46237611]
Merge remote-tracking branch 'github/canary'