Cumulated stable updates from "plugins" branch #2