AA: added timeout for migrations