Update align, utility from master.