Merge AssertEdit extension into core