Fix soledad imports (#5989).
Merge remote-tracking branch 'refs/remotes/drebs/bug/5989_fix-soledad-imports' into develop