Try to fix aliases and deferred service providers.
Merge pull request #3254 from franzliedke/patch-20

Try to fix aliases and deferred service providers.