Merge "Add success variables to message group and unify values"