Update align, utility from develop.