[#3008] Fixed rebase issue