#3721 merge into 2.5