Merge "fixed NPE while initializing controllers by commenting out the failure one for temporal fix" into main