Merge the latest JetBrains changes into TiVo