Merge branch 'Jacked-in_controller'