Migrated to latest Align plugin