Foreign ID references index and cache
Avoid crashing the tests
Tests for mps java plugin
Merge remote branch 'origin/master'