Merge "Replace .align with .balign to avoid ambiguity"