This part may require this PR to wait till next MC version bump.