#3460 fixed merge