Merge remote-tracking branch 'origin/devel-remove-rephraser'