Re #10390. Fix compile warnings.
Merge branch 'feature/10390_matrix_workspace_image_methods' into develop