Extended translation to all subjects

Might need restriction in the future to disallow unconnected subjects
Revert "Extended translation to all subjects"

This reverts commit c4b6911f0d09059e70af568e171443ecf8eb7378.
Merge branch 'develop'