Merge "Late tagging of ms7 branch"