Merge " Removed controller.version variable"