#5421: merge with 3.1.