Re #5939. Try to fix test that's failing in some places.
Merge branch 'feature/5939_ipython_interpreter' into develop