Merge "US1234: This merge has no body and that's OK"