Update with latest commits from raphaelm