Merge latest changes (fix of readonly plugins)