Wip rgw align

This fixes both #8442 amd #8928.