Merge "Remove NO_RETURN"