Added better compatibility with other controller resolver.
Merge branch 'develop'