#3599 fixed merge