Merging extends fixes.