Merge branch 'features/JAL-2136_phyre2_integration' into spikes/phyre