Merge pull request #4727 from metalbear-co/aviram/ci-intellij-gate