Merge "Bug 2131 - NPE when starting controller" into stable/helium