Merge noah_develop

has InControl implementation and controller testing scene