Merge of updates from develop branch to no_dist_prec.