WP-1780: alignment adjustment.