Update against PR #329 big set of random updates