8/23: merge casablanca to master

No match.