Merge parallels support and multiple improvements.