Feat: readd manually changes on align_chunks from pydata#10516

Feat: readd manually changes on align_chunks from pydata#10516