#2207117 Clean up infrastructure issue queue