Adding 6423 to the manual merges as the backport needed to be done in a separate PR
Adding 6423 to the manual merges as the backport needed to be done in a separate PR

astropy/astropy-tools,astropy/astropy-tools