Merge of the user_robustification branch.