manual merge of relevant updates from parallelism branch