Revert "Revert "Revert "Merge branch 'feature/6175_script_repo' into develop"""

This reverts commit c2e4cdb67b937cc35362e027e97d0fb3a0de5f1f.

Disabling the tests again.