Remove adjoin issues in 24.1 and 24.2