Post GIT Corruption - rebuild controller components