Kulungowski robustus

@olegsinyavskiy These are the latest Robustus changes.