Related: - looks like the same issue, but for s/and, s/orCLJ-2336 - looks like a consequence of this issue - probably related too