Fix for rebase from upstream latest