TL-54: Modify Canvas import screen for CL imports
Merge remote-tracking branch 'origin/develop' into develop