MDL-39864: A couple of small changes to improve default plugin behaviour