Merge latest JetBrains changes into TiVo