Merge "Fix error tag condition" into casablanca