fixed merge for #3485
#3485