Issue 3022 merge 2.5