10/31: merge casablanca to master