Resolve controller early.
Merge commit 'ff4d8dfa5e8679ca8c65dcd30b766ef3fae9cb45' into develop