Reapply changes that were regress in the latest merge