IdeaController bugfixes
Merge branch 'upupupdate' into develop