Optimize representations.
Reintroduce ServiceLocatorAwareInterface.
Merge branch 'vocabulary-member' into develop