Merge changes from robustness_commmon