#5057: Merge with 3.1.