Cumulated stable updates from "client" branch #1