issue 365241-54