Fixed: Don't break compatibility with plugin that were developed for …